Skip to content

[bot] Merge 26.7 to 26.9 - #752

Merged
github-actions[bot] merged 3 commits into
release26.9-SNAPSHOTfrom
26.9_fb_bot_merge_26.7
Sep 1, 2026
Merged

[bot] Merge 26.7 to 26.9#752
github-actions[bot] merged 3 commits into
release26.9-SNAPSHOTfrom
26.9_fb_bot_merge_26.7

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Generated automatically.
Merging changes from: 541f134
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.9_fb_bot_merge_26.7

labkey-martyp and others added 3 commits August 30, 2026 16:15
…747)

## Rationale

The cagemates demographics query could report animals as current
cagemates when they were not. The joined housing row was filtered only
on the animal being alive, so housing records that had already ended,
and records still in a non-public QC state, counted toward both the
cagemate list and the total. Separately, a housing row whose location
does not resolve through the cage lookup carries no location at all —
101 such rows exist in the container we checked — and those need to be
excluded deliberately rather than left to drop out of the results as a
side effect of null comparison.

## Changes

- Apply the same current-housing and public-QC-state filters to both
sides of the cagemates self-join, so only housing that is genuinely open
and visible contributes.

- Exclude housing rows with no resolved location, so they cannot
collapse into one shared facility-wide group.

- Drop a redundant room comparison, since room is derived from the
location key and adds nothing once the locations match.
## Rationale

The Observations form let a user pick any observation type but stored
every entry as Clinical, so behavior observations recorded there were
filed as clinical and dropped out of the behavior views. The form cannot
know the right value up front because it depends on which type the user
picks for each row, so the type is now derived on save from that type's
category. The behavior forms had the same mismatch from the other
direction: their Daily Observations shortcut bypassed the type-filtered
picker and wrote clinical-category observations and orders labeled as
behavior. Rows already saved with a mismatched type need a one-time data
fix; this change only affects new entries.

## Changes

- The Observations form no longer defaults an observation's type. The
trigger script derives it from the selected observation type's category,
while every other form continues to set the type explicitly, including
scheduled entries that inherit it from their order.

- The Daily Observations shortcut is now opt-in per form section rather
than always present, so it appears only on the clinical forms.
@github-actions
github-actions Bot merged commit d692e34 into release26.9-SNAPSHOT Sep 1, 2026
7 checks passed
@github-actions
github-actions Bot deleted the 26.9_fb_bot_merge_26.7 branch September 1, 2026 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants